<html>
<head><meta charset="utf-8"><title>resolving merge conflicts before a PR gets landed · general · Zulip Chat Archive</title></head>
<h2>Stream: <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/index.html">general</a></h2>
<h3>Topic: <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/resolving.20merge.20conflicts.20before.20a.20PR.20gets.20landed.html">resolving merge conflicts before a PR gets landed</a></h3>

<hr>

<base href="https://rust-lang.zulipchat.com">

<head><link href="https://rust-lang.github.io/zulip_archive/style.css" rel="stylesheet"></head>

<a name="247577339"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/resolving%20merge%20conflicts%20before%20a%20PR%20gets%20landed/near/247577339" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> fee1-dead <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/resolving.20merge.20conflicts.20before.20a.20PR.20gets.20landed.html#247577339">(Jul 29 2021 at 12:41)</a>:</h4>
<p>If I know that merge some other PR will make my own PR unmergable, is there a way to resolve this before the other PR lands?</p>
<p>I think the most obvious solution is to rebase my changes over the other PR's branch, which might be bad because what if that PR fails CI?</p>



<a name="247578653"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/resolving%20merge%20conflicts%20before%20a%20PR%20gets%20landed/near/247578653" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Joshua Nelson <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/resolving.20merge.20conflicts.20before.20a.20PR.20gets.20landed.html#247578653">(Jul 29 2021 at 12:53)</a>:</h4>
<p>I would just wait for the other PR to land personally</p>



<a name="247578747"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/resolving%20merge%20conflicts%20before%20a%20PR%20gets%20landed/near/247578747" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> apiraino <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/resolving.20merge.20conflicts.20before.20a.20PR.20gets.20landed.html#247578747">(Jul 29 2021 at 12:54)</a>:</h4>
<p>I usually try to get my PRs merged first (lol)</p>



<a name="247581071"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/resolving%20merge%20conflicts%20before%20a%20PR%20gets%20landed/near/247581071" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> fee1-dead <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/resolving.20merge.20conflicts.20before.20a.20PR.20gets.20landed.html#247581071">(Jul 29 2021 at 13:13)</a>:</h4>
<p><span class="user-mention silent" data-user-id="232545">Joshua Nelson</span> <a href="#narrow/stream/122651-general/topic/resolving.20merge.20conflicts.20before.20a.20PR.20gets.20landed/near/247578653">said</a>:</p>
<blockquote>
<p>I would just wait for the other PR to land personally</p>
</blockquote>
<p>Yeah, but we might be able to (have a functionality to) automatically detect when one PR creates conflicts for other PRs to make things run more smoothly.</p>



<a name="247581202"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/resolving%20merge%20conflicts%20before%20a%20PR%20gets%20landed/near/247581202" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> fee1-dead <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/resolving.20merge.20conflicts.20before.20a.20PR.20gets.20landed.html#247581202">(Jul 29 2021 at 13:14)</a>:</h4>
<p>which might be helpful but there really isn't an easy way to resolve this before the other PR gets merged.</p>



<a name="247584904"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/resolving%20merge%20conflicts%20before%20a%20PR%20gets%20landed/near/247584904" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> The 8472 <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/resolving.20merge.20conflicts.20before.20a.20PR.20gets.20landed.html#247584904">(Jul 29 2021 at 13:45)</a>:</h4>
<p>you could locally rebase your branch on top of the other PR</p>



<a name="247585024"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/resolving%20merge%20conflicts%20before%20a%20PR%20gets%20landed/near/247585024" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> The 8472 <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/resolving.20merge.20conflicts.20before.20a.20PR.20gets.20landed.html#247585024">(Jul 29 2021 at 13:46)</a>:</h4>
<p>you don't even need to add a new remote, github includes PRs in the repo heads</p>



<a name="247586609"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/resolving%20merge%20conflicts%20before%20a%20PR%20gets%20landed/near/247586609" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Taylor Yu [they/she] <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/resolving.20merge.20conflicts.20before.20a.20PR.20gets.20landed.html#247586609">(Jul 29 2021 at 13:59)</a>:</h4>
<p>bors will often comment on the PR if a merge has made the PR unmergeable</p>



<a name="247613324"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/resolving%20merge%20conflicts%20before%20a%20PR%20gets%20landed/near/247613324" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Joshua Nelson <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/resolving.20merge.20conflicts.20before.20a.20PR.20gets.20landed.html#247613324">(Jul 29 2021 at 17:17)</a>:</h4>
<p><span class="user-mention" data-user-id="361356">@fee1-dead</span> that wouldn't scale very well - there are over 400 open PRs for rust-lang/rust, you'd end up with hundreds of notifications. Especially for big PRs which conflict with literally everything.</p>



<a name="247668889"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/resolving%20merge%20conflicts%20before%20a%20PR%20gets%20landed/near/247668889" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> fee1-dead <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/resolving.20merge.20conflicts.20before.20a.20PR.20gets.20landed.html#247668889">(Jul 30 2021 at 04:21)</a>:</h4>
<p>It could be done only for approved PRs and we can just check if any PR earlier in the queue can cause conflicts for those later in the queue.</p>



<a name="247695397"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/122651-general/topic/resolving%20merge%20conflicts%20before%20a%20PR%20gets%20landed/near/247695397" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Joshua Nelson <a href="https://rust-lang.github.io/zulip_archive/stream/122651-general/topic/resolving.20merge.20conflicts.20before.20a.20PR.20gets.20landed.html#247695397">(Jul 30 2021 at 11:26)</a>:</h4>
<p>That would be less likely to spam notifications, but I'm still not convinced how much benefit it has. What is the expected outcome here? What are people supposed to do when they see a conflict, unapproved the PR? Then neither gets merged. And this doesn't handle semantic conflicts at all because git doesn't handle semantic conflicts.</p>



<hr><p>Last updated: Aug 07 2021 at 22:04 UTC</p>
</html>